oe commit 3

added functionality matching ap