Some refactoring
conflicts