Rewrite from scratch: 1.7.2 update