refactor to not depend on continuable
1.0.3