*8212* Action moved to more appropriate location