adopted changes from server