gave em better names.  wish i had refactoring!