@benjaminchan, @qiongyu -- helper modifications

@benjaminchan, @qiongyu -- helper modifications