supermarket swap revised