Some last minute adjustments...