Fixed location of estimates
Revert "Fixed location of estimates"

This reverts commit 52f452d9deb841b149708fb1f0d77f0c0fd59a2f.
Merge remote-tracking branch 'origin/master' into davids-fixes
Fixed estimates location
Merge pull request #149 from Useful-Innovation/davids-fixes

Fixed location of estimates