first update of legacy code