Final Update with Main