See if default works better
Some reafactoring and better doc.