now with less unecessary logging