Changes for Guilin release