Tried to get infuser to work a bit better