don't need the was there part of this anymore
a little reorder and comments