Updated with current edits