Updates to work by Cam