several changes made