added item and swap scaffolds