working on initial sync
reverted code
removed order by