Lots 'o changes to update function and produce output for Arcadis