renamed things in preparation for script4