Merge "switching to scripts from java"