edits from therinken