Added better locations