gymhero nov/dec update
merge