Removed DEBUG statments