New OP analysis, updates to EP analysis