Some mixed changes on Project 2