Whew, forgot I made changes to this a while back.