updated for newer releases of meteor;