Update logic on isTaken