V0.0.0.5 checked in (Final version with XSI); V0.0.0.6 started