Merged separate devel progress