updated specs and templates