B1 - added validation
B1 - fixed validation