project 7 and other commits