Added change according to comment