Opm improvements part 2