@jreback is this `elif` supposed to be shifted left to be under the `if` at line 226?