Implemented single-stepping