Here are the other changes without the async stuff