Remove debugging
Use new variables