changed formatting and added new variables