merged and now demoDetuneFP works