On going conversion to new debug system