Updated with Leon's edits