Implemented recommended Wand changes.