Same as the other branch but on IntelliJ