Changed variables format