switched bloody templates around again