fixed the overcomplicated relationships between user and location