basePosiotion() and goBack() upgraded