Updates on the logic