Jerry2 made several more changes