Some small modifications