few changes to match up to server