modifications for Autonomik-Demo