consolidated Ben changes with my own