Added stops and made filter-able from RHS