updated current
shortened copy