commiting everything up to ex7, and changes to previous once