trying stuff to fix the error I introduced with the restructure