better handling of the servo