addad Niklas' theory part
last commit