Made all the changes - works perfectly