Shave another byte off the improved version