some validations
Merge branch 'BranchSabrina'