Added "permanent location" functionality