Updated - Sanitized code