Making it work with intelliJ. v2