Update some logic
Update some logic