Fixed jar and rolled those commits into 1 commit