add selections & bug fixed