Changes made by Gill.