several changes applied