Embarrasing... forgot to update var names