adapted new version of master app