Replaced swap controller with store