Few small modifications