my and other templates fixed