Adjusted according to comments