small changes v.3