made templates same as 2.0