C47 minor work
C48 rework