Modified based on suggestions (#1)