improved teammate computation, layout