added moar wanted features