Reorganizing the order of the conditions to keep the integrity of the expected results.