added moar stuffs