This will simplify the code and improve re-use of rollover checking
This will simplify the code and improve re-use of rollover checking