Added what I think are changes made by Colin