minor improve2