Merge by Valerie

Merging Valerie's code with Rich's code