Changed things so I'm not debugging anymore