DEBUG statements commented out