Cleaned up flow.