Improve relisting

Hopefully