Adding modifications to "waedc" branch.