Changed some structural things