Taylor's changes from the server