simplified
Merge branch 'tighten'