Updates to make this work in the real world.