more servo intergration changes