added data sanitization