RT# 79239 - cleaned up code