Add some variables and comments