Boot3 Edits