added swap highlighting