End of night push - minor modifications