removed dependence on flanagan