Updated for working with devkit2