Changed variables format to make debugging easier