updates to work with combine tool