removed all unnecessary code