Reverting changes for debugiing