automated a bit more