new updates on the logic