Changed project from callback-style to generator style