copied changes from weekend work