Update towards v.03