Templates and 2 problems added