#34 deleted some outcommented old code