Modifying to suit Scotty particularly, with more appropriate template app