I think the logic is working now!