Working on issue #1575
Closes First Half of #1575 the actual renewal