Updated for qo buildilng.