Adding correct locations calculation