Filling in more of the implicit flow