GYM upgrade. 2