using smart selects
Merge branch 'using_smart_selects' into develop