added rayid edits back in