updated to work with .8.x