Modified based on the comments