added moar stuff