Small Changes and validate