Edits made to /86 and /87