refactor for qx 3.0