Updated for development in IntelliJ