few changes which were previously made at the server directly