More several changes