A couple of changes implemented