Reorganisation
Make it work when something is missing