Validations are being done properly now