updated cwall script