adding working copy as of 10th April 8:25pm