Done6
Merge remote-tracking branch 'origin/master'
Attempted fix to speed issue