System/butterfly: Updated for version 1.5.5