removing
changing structure