some more changes
partial commit