adopted for QX 4.0