removed some unnecessary methods
changed a lot