Hopefully works without self location now