Rearranged functions for consistency