Updated OP algorithm to use new setter and getter methods