Merged files and added notes