some outcommented code removed