Merged James and my project