Changes for debugging 7T