fanhattan_master --Do not merge