several changes to be included