Changed way isOver() works slightly