quite a few changes