changes from friday (p1)