Changed code for debugging