Edits from Calle