Change & bug Fix