added support for all legs and servers