add Ron's merged version