more staging, rolling back to N7 files