Forgot some
Refactor some templates