this should be added to the other servers aswell