Updated better formats