Final midnight improvements