Can get rid of these variables now I believe.