Started rewriting to synchronous