some edits from a while back