entered changes as suggested by TAs