McCain redesign, fixes #273