Added code from TFS