- added more helper functions