Partial Implementation of the EditPO

EditPO Implementation is Partial