improving for Windows/IntelliJ, but not there yet