refactoring on the intellij version and switch back to 12.0.4