comment out resorting of constraints
Better snapshot
fix virtual scoping demo