few structure changes