Updated Variables to adress issues 14, 20-30