new opf is mostly done