Just to clarify, should I keep this portion of the commit as-is, or should I try to make it not async?