Customer part big scale modification and bug fix