05 minor changes + teamwork