added moar features