Minor version 12, with Elv's suggestions.