New logic
updates
updates