added final changes from tuesday