Checked in by Rudy for comments