made somesome changes and additions