This also needs some work to work with older servers properly