some changes i made.