ATtempt to fix structure