upadate
changes after TC
minor edits