manuel and felix fiddling around

we intend to improve the general construction