some commented code removed