deleted just some outcommented code