fixed helpers and prep the next helper functions to write