Added gmm and bitch-slapping z into its place... it knows where it belongs