Adding second template, and fixing helpers