ADD: minor changes (upgrade)