* more niceification