rewriting the marketplace apply test