updates by mike v
updates by mike v