work in progress
Fixed for Apple unique identifier bug