Updated locations controller