done dona done, some more changes