added selection through code
resolved conflicts