Reducing strictness of validation
Still playing with validation