Fixing server , needs self