Added additional variables to play with