INSERT SCRIPTS ADDED
Merge conflicts resolved