Update with some personal changes