Made Templates to work