Updated based on comments from TA