some more changes :)