fixed some late evening logic