Trying to add checks