Daniel Antunes More Edits (not finished more to add)