Small modfications if template