This part was edit by branch lng01