mechanic + uiauto upgrade