Implemented server selection properly.