merged files from first attempt
added custom overlays