Feature/conf2