Trying to fix bug.  Not working...
Revert "Trying to fix bug.  Not working..."

This reverts commit e60bdb9ccf602f97ad6ade47095051ff42d9db2f.
Updated comments