converted to work with dev version - untested yet