Getting modifications to work for new version