Mechanic + uiauto upgrade