added some spesific to the new arch setup