Some changes made to server