Changes to autoclient