Completly changed the structure