More douche mode commits.