Changes to make .jar possible