chaning and fixing