7 Commits (wip-improve-reverse)