Fixing logic
Update!