A couple of changes