Changing the constructs for debugging purpopses