Modifications from Yan's catkinization.