About to change the logic