Requested changes from Voctec.