Fix some of day 4 and add more to day 5