Ashkan: manually compared and merged