Updated everything inline with templates
Updated everyything inline with templates