changes to merge from day 8