removed unnessisary stuff