updates with all of the "if" statements