Getting it working with flow again