Worked on SELECT mode functionality