some more changes, more to come