Minor change. Validation still needs more testing