added server and made a small change