Changes some logic