Added check for mobility changes and renamed private member