rbheromax's changes