Updated with Chia-che changes
Updated with Chia-che changes