Carried over some more additions to helper functions.