Revisions based on Raylin's email