Rewrote most of 21.30 to work directly off limits instead of around the
limits