several changes :)