Made more template changes