merging current working model with Project2 template