changes in darran's commit