some chnages...