updating code so that it will work with 0.8.0