Improve Guilin Scenario for Showcasing purposes #1