Updated: More template work