Adjusted according to comments from review