minor change, better interfaces