Work on helper functions