updated for new binaries structure