init merge from Connor's code
init merge