Incorporate comments from Hovav Shacham