consumption, more and more fixes