make some more changes 2