modifications based on changes to the new-jar pr