Reworked tank prediction logic