removed dependence on bonnie measure model