Final Format changes