refactored to be in classes