started working on disambiguation functionality