Somehow one of Rich's changes was reverted in my code. Fixed that.