snapshot for rework
19 files changed