added a few more options while shortening. Ugly, but needed