Template Pattern is now correct