minor alignement to latest submission changes.
the code still need a strong refactoring as the code is messy since time.