Added two separate modes. Also modified various things are per
instructions from review.