Some chnages