this creates problems with the GDPR. Need a quick solution!!