UPDATE MERGE

Current OP and EA code has been merged