more updates. TA's working