Merge Amnon code.