Restructure/spasm update