Updated with changes from reddit