Added validation
minor changes