Charlie's updated flows