some updates v.3