additions to improve workflow