Update to helmuth's current spec