Fixed more of Joshs mistake