Updating some logic