[IMP] Next day calc
[FIX] Performance issues