moar format changes