Logic shoudl be fine now