Removed DEBUG statements