separate script for each compshapes function
Update from script cleanup