pop fixed template bug

our templates can now be logic-less.