Better handling of upm sizes other than 1000