Followed TA's changes