Once again redid my structure