changed factor stuff to else if