Modifications required to use last byps version