Fixing this for partner programming efforts