Slight cahnge to instance variables