added changes from QCRI