removed vector -> list on helper functions, added args for handler