Added market as parameter