made some more changes :)