Latest changes made with chris on the master