Update with Jason comments