More work on fixed point mapping
...