A couple of changes to test better