More vars than I thought
Forgot to check it in