Changing logic to a simpler? solution.