This is much simpler than the previous incarnation.