Now configured to work with server