Added initial code for improved comparison flow.