Updating.
After radar. Other changes for radar in branch radar-clean-dir.