Updated Variables to be properly called