Updates concerning Joshs comments