some more changes on template