Logic update to