finish 

added some more changes