- add some checks for java