Changing things to better reflect future repo states