Edits from L. Malanga