refactor to use new flotilla