Some changes (fixed dupe bug!)