After location dealing improvements