changed to using another template