Fix callback chaining and un-ignore implemente steps