Updated to 7, added estructu