updated changes from friday