updated application, but disambiguation still does not seem to work correctly. TODO.