Adding modified templates first version