removed the commentted out code