second revision from home code base