Changed a lot
Fixed merge Bugs