Refactoring to remove flicker when adding accessories.