Checked in by Rudy Xiong for Singleton