added user checks