a bit o clean up.. changed to using user properties