Reordered functions for consistency