Change UniqueId , Bug fix required
has bugs