add correct path to values, and formating