revision j.v1.streamlined