changed running_with to running_mate
changed header order