merge with vitaut/format