Added variables to correct group in main model