CHNAGED:sort of minor modifications