Improvements to Wheel Code