Update with current code