some edits i think