some more local changes