Changed to structure to match new script.