few tweaks, next up times