Now works with both simple and not format