Merged Fadi's changes

Hopefully fixed the long loading times