updating validation logic
adding more gooder