general improvement + add dev connecton fct