Update with my modifications