make it work with new style format as well