new feture & bug fixed