Mislabeled a variable - now full implementation