Upgraded templates to work with SS3