C2 Done
refactor