- commit code for OP-24, OP-25