Update with proper comments