Update, again

Working code now.