structure change

broken!