added check to verify if everything is filled