struct changes. changed templates