Added some structure to the variables here.