Tested a couple of changes