* modefied formater/changed template