Some small modifications
Some small modifications