Merge TK's Changes