change over to FSM, now everything lines up nice, #4