Improved ID things a lot