fixing my structure again...