changed the structure yet again