Why are this changes needed?