Fix up stephenson -- still doesn't work right.