Port to IntelliJ