removed limit and order by