work on making the data fetch faster
Merge remote-tracking branch 'origin/master'
fixing apiclient
Merge remote-tracking branch 'origin/master'