Static additions to just make correct setup +

working (have to be done proper way later on)