edits from MFuentes