Made some changes so it stops freaking out.