more work on Flump support