adding devkit changes