now it works with new format