fixed the location mismatch - just need to organize it better