Whoops - added indexed click impl