Added validation
Fixed merge conflict