Sync Cindy's changes