Refactoring by katia - Do not merge yet(LK)