Updated CSWAL to match the CS version...