changed some types