Update with lots of bugs