9 Commits (crueter-patch-2)