C27 minor work
C4 rework
C28 minor work