the above is messy  - clean it up

ALSO VERIFY THAT HIS CHANGE IN BEHAVIOR DOES NOT AFFECT ANY OTHER USERS

Also comment as to the effect of this change