Removing future() and updating then method