update to fix structure