Philipwjones/cosim3/new branch