Storage locations are now much more understandable