incorporated leon's edits