Fixed jacked up template + versioning