b4 refactoring
14/05/13