updated for qx 3 and 3.5