changing to the new style/format