More updates on critical path (1st)