Working with new location function now