Did some more changes