WIP changes related to Recycled Numbers