reorganized methods for a more inuitive flow