Reconstructed to suit my new teaching circumstances