Add more logic to market