Adding CMP 81FC handling. Small step after small step.