added structure changes