fixed settings and server side