Modification to master template

Basic