Adding several changes