More changes in server: now it's even working