Adding changes for debugging