Changed some of the structure