Added location change, new functions