Made some changes for Rev B