Edits to fit D802