commenting out additional disambiguation logic which are not complete