forgot to remove the 'else' from moving stuff around.  doh.