update as per comments from f2f in Los Angeles