added droid class and removed auto plau