ENH: Port DIY revision 164