updated to work with the new rbhn re-factored code