[Cin]Checked into GIT some of Andrew's latest changes