Implementing Janet's Updates

Per Janet's email, which Ali approved.