T87 Changes following code review