Dropped sync mode, made it really async-ish and simpler