improvements over privacy handling