Overriden cosmetic changes, now rewritten intot he file