Third time's a charm

Trying again, this time will amend for real.