Update with elemoine comments