Update Code after changes from CodeReview 1