some minor adjustments by Paracel