Modified after Code Review