Added suffix, still some quirks to figure out