Changes recommended by @keflavich