latest updates to v4
updates after IntelliJ cleanup