Adjusted things to the new format