Logic and format update