changed some types around