upd for 0.3