update from AMO review