Changes as per Suggestion