Relist request
Added missing things to previous commit and some cleanup