4 Commits (refactor_future)