corrected some parts