Replaced songbird: protocol by ngale: part of issue #121