10.01 modified and fixed