added check on add to firstset