added stuff for Ranch 99 Market
fixed merge on ranch99