Further team navigation development