Changes in the logic