minor changes for validation