removed unneccesary stuff