CHANGED : commented out debug lines