What are these changes needed for? Seems like clutter to me..