changed some structure