Added some logic to make selection timing feel better