Checked in by rudy for updating