Hopefully correct OP-timing now