Change the logic