now with less warnings