updated for oF 008