Added user checks