Now using Intellij instead of Eclipse