Make For a bit smarter about its payload