manual sync 25/06

last sync is about week-5-assingment