deleted some faulty and outcommented code