modfied for  release version