edited few parts