[changes from birch]