added features for debugging