Follow-up work on Rotifer connector.