Merged old code to new project