Updates for v.007