updated helpers
getting everything to compile