rearranging checks to make more sense